From 6e59f30cbdfc0b21b81064b511873507e187e3c1 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Sat, 2 Apr 2011 15:57:35 +0100 Subject: [PATCH] amd-iommu: __init-annotate Besides marking a few more items __init/__initdata, use the recently introduced .init.o mechanism to move all the literal strings into .init.rodata in those files that consist of only contributions to .init.*. Signed-off-by: Jan Beulich --- xen/drivers/passthrough/amd/Makefile | 4 ++-- xen/drivers/passthrough/amd/iommu_acpi.c | 5 +++-- xen/drivers/passthrough/amd/iommu_detect.c | 2 -- xen/drivers/passthrough/amd/iommu_init.c | 12 +++++------- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/xen/drivers/passthrough/amd/Makefile b/xen/drivers/passthrough/amd/Makefile index 48bd305c06..687bc8ec6f 100644 --- a/xen/drivers/passthrough/amd/Makefile +++ b/xen/drivers/passthrough/amd/Makefile @@ -1,6 +1,6 @@ -obj-y += iommu_detect.o +obj-bin-y += iommu_detect.init.o obj-y += iommu_init.o obj-y += iommu_map.o obj-y += pci_amd_iommu.o -obj-y += iommu_acpi.o +obj-bin-y += iommu_acpi.init.o obj-y += iommu_intr.o diff --git a/xen/drivers/passthrough/amd/iommu_acpi.c b/xen/drivers/passthrough/amd/iommu_acpi.c index 8e0868fabd..57a4c16dde 100644 --- a/xen/drivers/passthrough/amd/iommu_acpi.c +++ b/xen/drivers/passthrough/amd/iommu_acpi.c @@ -28,11 +28,12 @@ extern unsigned long amd_iommu_page_entries; extern unsigned short ivrs_bdf_entries; extern struct ivrs_mappings *ivrs_mappings; -extern unsigned short last_bdf; extern int ioapic_bdf[MAX_IO_APICS]; extern void *shared_intremap_table; -static void add_ivrs_mapping_entry( +static unsigned short __initdata last_bdf; + +static void __init add_ivrs_mapping_entry( u16 bdf, u16 alias_id, u8 flags, struct amd_iommu *iommu) { u8 sys_mgt, lint1_pass, lint0_pass, nmi_pass, ext_int_pass, init_pass; diff --git a/xen/drivers/passthrough/amd/iommu_detect.c b/xen/drivers/passthrough/amd/iommu_detect.c index a98bef586c..164a6aeb9a 100644 --- a/xen/drivers/passthrough/amd/iommu_detect.c +++ b/xen/drivers/passthrough/amd/iommu_detect.c @@ -27,8 +27,6 @@ #include #include -unsigned short last_bdf = 0; - static int __init get_iommu_msi_capabilities(u8 bus, u8 dev, u8 func, struct amd_iommu *iommu) { diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index a65c9d587c..dc88c021d9 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -28,10 +28,8 @@ #include #include -static struct amd_iommu **irq_to_iommu; -static int nr_amd_iommus; -static long amd_iommu_cmd_buffer_entries = IOMMU_CMD_BUFFER_DEFAULT_ENTRIES; -static long amd_iommu_event_log_entries = IOMMU_EVENT_LOG_DEFAULT_ENTRIES; +static struct amd_iommu **__read_mostly irq_to_iommu; +static int __initdata nr_amd_iommus; unsigned short ivrs_bdf_entries; struct ivrs_mappings *ivrs_mappings; @@ -629,8 +627,8 @@ static int __init allocate_cmd_buffer(struct amd_iommu *iommu) iommu->cmd_buffer_tail = 0; iommu->cmd_buffer.alloc_size = PAGE_SIZE << get_order_from_bytes( - PAGE_ALIGN(amd_iommu_cmd_buffer_entries * - IOMMU_CMD_BUFFER_ENTRY_SIZE)); + PAGE_ALIGN(IOMMU_CMD_BUFFER_DEFAULT_ENTRIES + * IOMMU_CMD_BUFFER_ENTRY_SIZE)); iommu->cmd_buffer.entries = iommu->cmd_buffer.alloc_size / IOMMU_CMD_BUFFER_ENTRY_SIZE; @@ -643,7 +641,7 @@ static int __init allocate_event_log(struct amd_iommu *iommu) iommu->event_log_head = 0; iommu->event_log.alloc_size = PAGE_SIZE << get_order_from_bytes( - PAGE_ALIGN(amd_iommu_event_log_entries * + PAGE_ALIGN(IOMMU_EVENT_LOG_DEFAULT_ENTRIES * IOMMU_EVENT_LOG_ENTRY_SIZE)); iommu->event_log.entries = iommu->event_log.alloc_size / IOMMU_EVENT_LOG_ENTRY_SIZE; -- 2.30.2